projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d4bf00 d6a07c3)
bitkeeper revision 1.1275 (4252bc56kCvTabPneNuKD6vpuDEO7g)
authorxen-ia64.adm@bkbits.net <xen-ia64.adm@bkbits.net>
Tue, 5 Apr 2005 16:27:02 +0000 (16:27 +0000)
committerxen-ia64.adm@bkbits.net <xen-ia64.adm@bkbits.net>
Tue, 5 Apr 2005 16:27:02 +0000 (16:27 +0000)
Merge bk://xen.bkbits.net/xeno-unstable.bk
into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen/arch/ia64/domain.c patch | diff1 | diff2 | blob | history
xen/include/xen/sched.h patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen/arch/ia64/domain.c
Simple merge
diff --cc xen/include/xen/sched.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.